From: Jan D <jan.h.d@swipnet.se>
Date: Sat, 23 May 2015 10:34:45 +0000 (+0200)
Subject: Merge branch 'cairo'.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~2819
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c03c730481bd2dc7bc857d9b4f1c41eea9bd495e;p=emacs.git

Merge branch 'cairo'.

Main work done by YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>.
Small fixes and image work by Jan D. <jan.h.d@swipnet.se>.
---

c03c730481bd2dc7bc857d9b4f1c41eea9bd495e